From d2c037c1dd216ceb08c74bdf4b5665d0d63e9e86 Mon Sep 17 00:00:00 2001 From: Vasudev Kamath Date: Sat, 23 Sep 2017 10:39:43 +0530 Subject: [PATCH] Rename clean-cargo-deps.patch to follow patch naming guidelines Adjust make_orig_multi.sh to use new patch name. --- debian/make_orig_multi.sh | 4 ++-- .../{clean-cargo-deps.patch => 2004_clean-cargo-deps.patch} | 6 ++++-- debian/patches/series | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) rename debian/patches/{clean-cargo-deps.patch => 2004_clean-cargo-deps.patch} (92%) diff --git a/debian/make_orig_multi.sh b/debian/make_orig_multi.sh index 785bdc1e6..aff3b3341 100755 --- a/debian/make_orig_multi.sh +++ b/debian/make_orig_multi.sh @@ -38,8 +38,8 @@ cd cargo # Trim the list of dependencies echo "" -echo "Applying clean-cargo-deps.patch... If this fails, remember to refresh the patch first!" -patch -p1 < ${WORKDIR}/debian/patches/clean-cargo-deps.patch +echo "Applying 2004_clean-cargo-deps.patch... If this fails, remember to refresh the patch first!" +patch -p1 < ${WORKDIR}/debian/patches/2004_clean-cargo-deps.patch # Download build-deps via cargo-vendor export GIT_AUTHOR_NAME="deb-build" diff --git a/debian/patches/clean-cargo-deps.patch b/debian/patches/2004_clean-cargo-deps.patch similarity index 92% rename from debian/patches/clean-cargo-deps.patch rename to debian/patches/2004_clean-cargo-deps.patch index 82b2fb3fc..9afe8fbbd 100644 --- a/debian/patches/clean-cargo-deps.patch +++ b/debian/patches/2004_clean-cargo-deps.patch @@ -1,12 +1,14 @@ -From: Luca Bruno -From: Ximin Luo Description: Remove stage1 extra dependencies (cargo 0.17) Fetching extra dev-dependencies is not yet supported by bootstrap.py and they are not need to build. However, cargo will try to download them before building stage1. . For patches for earlier versions of cargo, see the git history for this file. +From: Luca Bruno +From: Ximin Luo Forwarded: not-needed +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/Cargo.toml +++ b/Cargo.toml @@ -51,12 +51,12 @@ diff --git a/debian/patches/series b/debian/patches/series index fe7ec6547..b28424fb6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ -clean-cargo-deps.patch +2004_clean-cargo-deps.patch 2003_local-jquery.patch 2001_use-system-libgit2.patch 2002_disable-net-tests.patch -- 2.30.2